Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 1 Feb 2007 13:15:03 +0000 (13:15 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 1 Feb 2007 13:15:03 +0000 (13:15 +0000)

Trivial merge